image: add image layout validation #84

zhouhao3 · 2016-11-15T03:36:21Z

Increase the validation of the files contained in the layout.
Including blobs , oci-layout and index.json files.

Signed-off-by: zhouhao [email protected]

zhouhao3 · 2016-11-17T08:14:28Z

@wking @xiekeyang @stevvooe @philips @coolljt0725 @vbatts PTAL

xiekeyang · 2016-11-17T08:45:50Z

Autodetect is just distinguishing between types. In next steps(unpack or validation) objects will be found and determined. That can make process complete.
So this modification seems to be superfluous.

coolljt0725 · 2016-11-17T08:46:36Z

opencontainers/image-spec#459 has clarify that blobs and refs MUST exist, but for the oci-layout, the file name is not clear if it must be oci-layout at the moment.

wking · 2016-11-17T14:58:28Z

I think the presence of oci-layout with a recognized version is enough to decide the target is attempting to be an image-layout. The presence of blobs and refs directories are part of determining whether that image-layout is valid/usable, but they probably don't need to be part of autodetection.

stevvooe · 2016-11-18T20:09:50Z

image/autodetect.go


 	if fi.IsDir() {
+		for _, file := range Layoutfile {
+			if _, err = os.Stat(path + file); os.IsNotExist(err) {


You have to also make sure that each item is a directory or file (oci-layout must be a file).

Use filepath.Join here. Using + doesn't work correctly cross-platform.

stevvooe · 2016-11-18T20:10:01Z

image/autodetect.go

 	if fi.IsDir() {
+		for _, file := range Layoutfile {
+			if _, err = os.Stat(path + file); os.IsNotExist(err) {
+				return "", errors.New("unknown media type")


Make this more specific.

stevvooe · 2016-11-18T20:10:14Z

image/autodetect.go


+// Layoutfile realize the image files that are included in the image layout type
+var Layoutfile = []string{
+	"/blobs",


No need for leading slash: use filepath.Join.

Mashimiao · 2017-01-20T01:59:06Z

If we just support image layout, image, manifest, manifestlist and image config, there is no need to add layout validation in autodetect. Because if the input is a directory, it should be considered as a image layout. Only image layout could be a directory in supported type validation
I think move the code in this PR into image.ValidateLayout() will be better.

vbatts · 2017-02-08T19:27:54Z

image/autodetect.go

+var Layoutfile = []string{
+	"blobs",
+	"oci-layout",
+	"refs",


this is changed now. There is no longer a ./refs/ directory. And there is an index.json file. See the updated image-layout.md doc.

Mashimiao · 2017-04-19T07:53:52Z

@q384566678 The Travis CI failed, I think you need to fix TestValidateLayout in image_test.go

zhouhao3 · 2017-04-19T08:19:13Z

The Travis CI failed, I think you need to fix TestValidateLayout in image_test.go

I'm doing, but there are some content to wait for image-spec certain.

zhouhao3 · 2017-07-19T02:55:44Z

Some methods in #50 are used to update the validation of layout.
@xiekeyang @coolljt0725 @cyphar @stevvooe @vbatts PTAL

zhouhao3 · 2017-07-20T01:16:03Z

reping @opencontainers/image-tools-maintainers I hope you can take a moment to review this PR, which is an important validation that is missing.

coolljt0725 · 2017-07-20T02:20:00Z

image/layout.go

+	"github.com/pkg/errors"
+)
+
+var blobsExist, indexExist, layoutExist bool


can we put these into layoutValidate?

ok, updated.

Signed-off-by: zhouhao <[email protected]>

coolljt0725 · 2017-07-20T02:35:56Z

LGTM tested, it works for me

xiekeyang · 2017-07-20T06:22:12Z

LGTM

zhouhao3 force-pushed the test-layout branch 6 times, most recently from c9272dd to ce32d77 Compare November 15, 2016 06:16

stevvooe reviewed Nov 18, 2016

View reviewed changes

zhouhao3 force-pushed the test-layout branch 5 times, most recently from cb75f90 to 63b3fc4 Compare November 30, 2016 07:58

vbatts reviewed Feb 8, 2017

View reviewed changes

zhouhao3 force-pushed the test-layout branch 2 times, most recently from 8adac93 to 70d4a8e Compare February 17, 2017 06:36

zhouhao3 force-pushed the test-layout branch from 70d4a8e to c9d0009 Compare March 8, 2017 08:03

zhouhao3 mentioned this pull request Jun 21, 2017

make the image-tool work with -rc5 #144

Merged

zhouhao3 force-pushed the test-layout branch 4 times, most recently from 3dfb290 to 148e4ba Compare June 26, 2017 02:47

zhouhao3 force-pushed the test-layout branch 2 times, most recently from 4b9bdae to fe62cfe Compare July 19, 2017 02:46

zhouhao3 changed the title ~~autodetect.go: Increase the judgment condition~~ image: add image layout validation Jul 19, 2017

zhouhao3 force-pushed the test-layout branch 3 times, most recently from a5f7c1c to 2773bda Compare July 19, 2017 06:21

coolljt0725 reviewed Jul 20, 2017

View reviewed changes

image: add image layout validation

df5907a

Signed-off-by: zhouhao <[email protected]>

zhouhao3 force-pushed the test-layout branch from 2773bda to df5907a Compare July 20, 2017 02:24

xiekeyang merged commit dae3162 into opencontainers:master Jul 20, 2017

zhouhao3 deleted the test-layout branch July 20, 2017 06:28

coolljt0725 mentioned this pull request Jul 20, 2017

Validate oci-layout version #50

Closed

xiekeyang mentioned this pull request Sep 8, 2017

version： bump to v0.3.0 #183

Merged

image: add image layout validation #84

image: add image layout validation #84

Uh oh!

Conversation

zhouhao3 commented Nov 15, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

zhouhao3 commented Nov 17, 2016

Uh oh!

xiekeyang commented Nov 17, 2016

Uh oh!

coolljt0725 commented Nov 17, 2016

Uh oh!

wking commented Nov 17, 2016

Uh oh!

stevvooe Nov 18, 2016

Choose a reason for hiding this comment

Uh oh!

stevvooe Nov 18, 2016

Choose a reason for hiding this comment

Uh oh!

stevvooe Nov 18, 2016

Choose a reason for hiding this comment

Uh oh!

Mashimiao commented Jan 20, 2017

Uh oh!

vbatts Feb 8, 2017

Choose a reason for hiding this comment

Uh oh!

Mashimiao commented Apr 19, 2017

Uh oh!

zhouhao3 commented Apr 19, 2017

Uh oh!

zhouhao3 commented Jul 19, 2017

Uh oh!

zhouhao3 commented Jul 20, 2017

Uh oh!

coolljt0725 Jul 20, 2017

Choose a reason for hiding this comment

Uh oh!

zhouhao3 Jul 20, 2017

Choose a reason for hiding this comment

Uh oh!

coolljt0725 commented Jul 20, 2017 • edited by caniszczyk Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

xiekeyang commented Jul 20, 2017 • edited by caniszczyk Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

zhouhao3 commented Nov 15, 2016 •

edited

Loading

coolljt0725 commented Jul 20, 2017 •

edited by caniszczyk

Loading

xiekeyang commented Jul 20, 2017 •

edited by caniszczyk

Loading